Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Nuclear Station 14 Ports #47

Merged
merged 12 commits into from
Dec 22, 2024
Merged

Nuclear Station 14 Ports #47

merged 12 commits into from
Dec 22, 2024

Conversation

Aidenkrz
Copy link
Collaborator

@Aidenkrz Aidenkrz commented Dec 21, 2024 •
edited
Loading

By request from Old Dance Jacket, who wanted to be able to use N14 Mapping Assets in SSS.

@Icepicked @Aidenkrz
Nuclear Station 14 Ports (Goob-Station#3)
c0d60b7 
* Nuclear Station 14 Ports

Combines all PR's from old Repo into one.

* lightbulb
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 21, 2024 •
edited
Loading

RSI Diff Bot; head commit dbca63d merging into 964f56b
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/_Nuclear14/Structures/Decoration/barrels.rsi

State Old New Status
Added
double_grey_1 Added
double_grey_2 Added
double_red_1 Added
double_red_2 Added
double_toxic_1 Added
double_waste_1 Added
double_waste_2 Added
double_yellow_1 Added
double_yellow_2 Added
flammable_1 Added
flammable_2 Added
flammable_3 Added
grey_1 Added
grey_2 Added
grey_3 Added
hazard_1 Added
hazard_2 Added
hazard_3 Added
label_1 Added
label_2 Added
label_3 Added
quad_grey_1 Added
quad_red_1 Added
quad_red_2 Added
quad_toxic_1 Added
quad_waste_1 Added
quad_yellow_1 Added
red_1 Added
red_2 Added
red_3 Added
red_alt_1 Added
red_alt_2 Added
red_alt_3 Added
toxic_1 Added
toxic_2 Added
toxic_3 Added
toxic_4 Added
triple_grey_1 Added
triple_grey_2 Added
triple_grey_3 Added
triple_red_1 Added
triple_red_2 Added
triple_toxic_1 Added
triple_toxic_2 Added
triple_waste_1 Added
triple_waste_2 Added
triple_waste_3 Added
triple_yellow_1 Added
triple_yellow_2 Added
triple_yellow_3 Added
warning_1 Added
warning_2 Added
warning_3 Added
waste_1 Added
waste_2 Added
waste_3 Added
yellow_1 Added
yellow_2 Added
yellow_3 Added

Resources/Textures/_Nuclear14/Structures/Decoration/barriers.rsi

State Old New Status
concrete_barrier Added
concrete_barrier_1 Added
concrete_barrier_2 Added
concrete_barrier_3 Added
concrete_barrier_4 Added
concrete_barrier_5 Added
concrete_barrier_alt Added
concrete_barrier_alt_1 Added
road_barrier Added

Resources/Textures/_Nuclear14/Structures/Decoration/cave_decor.rsi

State Old New Status
boards_drought_ns-1 Added
boards_drought_ns-2 Added
boards_drought_ns-3 Added
boards_drought_ns-4 Added
boards_drought_ns-5 Added
boards_drought_ns-6 Added
boards_drought_we-1 Added
boards_drought_we-2 Added
boards_drought_we-3 Added
boards_drought_we-4 Added
boards_drought_we-5 Added
boards_drought_we-6 Added
boards_mammoth_ns-1 Added
boards_mammoth_ns-2 Added
boards_mammoth_ns-3 Added
boards_mammoth_ns-4 Added
boards_mammoth_ns-5 Added
boards_mammoth_ns-6 Added
boards_mammoth_we-1 Added
boards_mammoth_we-2 Added
boards_mammoth_we-3 Added
boards_mammoth_we-4 Added
boards_mammoth_we-5 Added
boards_mammoth_we-6 Added
minecart_fallen Added
sign_left Added
sign_right Added
stalagmite Added
stalagmite1 Added
stalagmite2 Added
stalagmite3 Added
stalagmite4 Added
stalagmite5 Added
support Added
support_beams Added
support_wall Added
support_wall_broken Added

Resources/Textures/_Nuclear14/Structures/Decoration/flora.rsi

State Old New Status
agave-dead Added
branch Added
branch_broken Added
broc-dead Added
brushwood Added
brushwood_alt Added
ferocactus-dead Added
mutfruit-dead Added
tall_grass_1 Added
tall_grass_2 Added
tall_grass_3 Added
tall_grass_4 Added
tall_grass_5 Added
tall_grass_6 Added
tall_grass_7 Added
tall_grass_8 Added
timber Added
tree_log Added
tree_stump Added
tree_timber Added
xander-dead Added

Resources/Textures/_Nuclear14/Structures/Decoration/rails64.rsi

State Old New Status
junction-left-bottom Added
junction-left-top Added
junction-right-bottom Added
junction-right-top Added
rails Added
turn-NE Added
turn-NW Added
turn-SE Added
turn-WS Added

Resources/Textures/_Nuclear14/Structures/Decoration/signs_64x64.rsi

State Old New Status
bazaar Added
we_open Added

Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi

State Old New Status
junktire1 Added
junktire2 Added
junktire3 Added
junktire4 Added
junktire5 Added

Resources/Textures/_Nuclear14/Structures/Decoration/torches.rsi

State Old New Status
torch_lit Added
torch_unlit Added
wall_torch_lit Added
wall_torch_unlit Added

Resources/Textures/_Nuclear14/Structures/Decoration/world.rsi

State Old New Status
barrels1 Added
barrels2 Added
barrels3 Added
barrels4 Added
barrels5 Added
barrels6 Added
bookpile_1 Added
bookpile_2 Added
bookpile_3 Added
bookpile_4 Added
bookpile_5 Added
bookpile_6 Added
bookstack_1 Added
bookstack_2 Added
bookstack_3 Added
brickpile Added
brickrubble Added
cardboard Added
concrete_barrier Added
concrete_barrier_1 Added
concrete_barrier_2 Added
concrete_barrier_3 Added
concrete_barrier_4 Added
concrete_barrier_5 Added
concrete_barrier_alt Added
concrete_barrier_alt_2 Added
foodstuff_1 Added
foodstuff_2 Added
foodstuff_3 Added
foodstuff_4 Added
foodstuff_5 Added
foodstuff_6 Added

Edit: diff updated after dbca63d

@Aidenkrz
Copy link
Collaborator Author

It's going to be a fine night tonight

@Simyon264 Simyon264 merged commit e481cf9 into Goob-Station:master Dec 22, 2024
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Changes: Audio Changes: No C# Changes: Sprites size/S
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Aidenkrz @Simyon264 @Icepicked